Workspace related fixes