Fixed up some things that got messed up somehow