Some missed changes and fix an error.