Fix base binary path once again.
Clean streamline xml.