Improve some waits