some fixes in RTMFinal