Fix build config, take 2.