GPU OC work and fixups