Various changes to match generator-webapp fixes