Fixed some clumsy mistakes