Dashboard bugfixes