Correct mistakes in previous commit