Config and security fix