Several build config changes/fixes.