Virtual teams + minor fixes

Virtual teams + minor fixes