Fix push/pull