Fix typos and compensate for previous ones elswhere