Fixes for Haiku.