Fixed some overlooked errors