Regenerate config
Fix compilation with O3