MORE build fixes