Fixes for OOIION-666 - platform and instrument model arrays to align with device arrays