Fixed some stuff for my OCD