Some fixes to pushing I made a while ago.