GPU: fixes and some other changes