post code review fixes
Merge pull request #1 from stxnext/late_application_json

post code review fixes