Pushing ST3 fix and other small changes.