Some fixes for new user views breaking on bad data or certain configurations.