More tweaks, parity with previous rtc version in terms of stability