Miscellaneous fixes and enhancements

Could this use a better name?  The name suggests to me this may be referencing a SecuritySystem referenced as a static.