Fixes to App Factory tools.