* Rest of the changes for Haiku branch.