Workspace fixes