[misc] Improved security