Resolved various issues with tenant switch