A few fixes for dealing with PGPUs