Fix problems with parameterized workspaces