Fixed some incongruencies