Added security fixes

Added security fixes