Cheap security fixes

Cheap security fixes