Fixed up some bad commits