Fix typo and add missing normalizeInput()s