Fix config option

Fix a bunch of problems reported by @bonzini