Enable additional config
Fix trivial