Fixes to INB and SST formats