More bugs fixed
Merge branch 'release/fix-bugs-with-security-policy'