More build config tweaks