more build fixes x2