Minor fixes (typo, duplicate declaration, wrong comment).