Dashboard bug fixes