More RTC 4.0.5 M1 fixes