A few more fixes for GPU OC