Hotfix

Fixes #1.  Fixes #2.  Also fixes some minor issues reported on AppLinkTriage page.