Fixes/tweaks for waiting