Fixed up some errors