Issues with recent changes

Some issues with the Security class changes, reference to a removed class, a documentation fix.