Fix custom waits