Fixes and features: Wait