Cleanup Handlers and fix build