Handlers: various fixes