Fixed some bugs with the new handlers.