Further build fixes