Fixed some remaining bugs with uniform-bindings