merge target and invocation fixes