Fixes based on vendor comments.
Merge branch 'master' of https://github.com/commoncriteria/application