Fix adding/removing workspaces