Satisfy structure tests

DEPLOYMENT BRANCH ONLY: plus some extra fixes cos: no tests/

Change-Id: I2088bbb20e9b2d0809a9f671e77c366016c7fc4c