Addl fix #397: GPU acceleration