bugs in hybrid wait plus removed unnecessary namespace redefinitions