Fixed bug where uniforms were not being mapped properly