Fixes to pull/push logic.