Final (I hope) fixes for RT2 patch