push wait fixes