fixes on switching workspaces