Fixed up some minor issues