fixes to the active wait