Tweaks for changes in app-template