VG-1521: fixes to handle different workspace types