Fix return value, typo and comment