Small fixes, rename event
Handle case where no dashboard db gracefully