Rtc improvements