Fix the workspace