fix Handler instance reference inside closure
Fix some CS.