Small changes to help with future shaders