Fixed small bugs in push/pull. May need more work