Fixed errors caught in review