more push handling fixes