Fix parser handlers