Increase timeout for push
Update monitor to be more or less correct.