Fixes for visibility and better cleanup in case of creation strategy errors