Fixing push_down/call_up bugs