Fixes

Fixes Problems with Workspace