More security fixes for conf
Reformatted to fit 80 col rule