Fixed some waits for condition