Fix: typo and code tweak