Small typo and add fixes