Fixes for models and some other dashboard stuff