additional build fixes.