More minot fixes to structure - moving forwards