Handler fixes

Fixed a few thing at the handler