Fix dashboard issues