Registration and TTORP fixes