Fix dashboard bugs