More fixes to new shader generation stuff