handler invocation fixes