Fix some typos and namespace errors.