Fix typo and handlers