Fixed some error prior to previous changes