Tested on NVIDIA. Minor fixes.

Did go to GL version 4.1, as I am using layout qualifiers. AMD driver
did not complain. NVIDIA does.