FIX added more fixes from Russ (user-security-report)