Fix global handler paths