More security fixes