Fixing workspaces stuff.