Fixed some creeping errors