Various fixes
Merge branch 'dev/justin' of github.com:partypoopa/enablement-plans-tools-static into dev/justin