Here we finish up this upgrade series by removing all deprecation warnings and fixing some problems in the view.