Unstable push: various bugs