FIX: More security hardening