Fix Handlers to use new path system.