Fixed up some stuff