Fix app and templates tasks