Fixes on RTM fine grained locks