yet more build fixes