Upgrade build-config to 6
Some warning fixes.