workspace mode related fixes