more gpu fixups