Fix typo and add missed changes