Fixed up some cosmetic bugs