Some fixes introduced when adding ST2 support...