Fixed some stuff with handlers.