Fixes for "Add dashboard" functionality