Further RTM fixes.