Fix both setup and dashboard