Fixed up minor issues