Fixed more stuff in handlers.