changes to try and fix failing travis build with CmdQueue