Improvements to alignment and TSIO