Tweaks to get the generator running on the next app.