Various fixes and updates

Keeping up with dashboard updates