Fixed up Workspace a wee bit