Fixes in Handler