More config checks and clean up for vm_config settings