workspace fixes