Fixes in Wait()