Merge pull request #1298 from billhollings/auto-gpu-capture-fixes

Fixes to auto GPU capture