Enabled a couple double security checks