RTC 4.0.5 M2 fixes