build fixes galore