More security checks