"Fixed" uniform binding errors
Fixed conflicts