Fix a few more handler related things.