More workspace fixes