Fixed up some things