Haiku build fixes

Merge request reports