more gpu fixups
Merge pull request #1 from goodwin/jb-devel-mr2-release

more gpu fixups