Fixes to RTM TL2