Uniform fixes!

Yess, fixed'em!