Security Enhancements

This was pushed on dev and looks OK. @jgmize r?