Fix route handlers