A few bugfixes to the new workspace viewer