Haiku build fixes