More fixes to bio-unit interfaces mapping