Security Improvements - Moe

Moe