Fix bugs from policy refactoring
Merge branch 'master' of https://github.com/camsys/transam_core