Wait fixes