Fixed several small errors relating to differences between NVIDIA and AMD