Some smaller changes.
Actually, it should only omit an obsolete GPU call.