Fix schedulers merge
Fix rtc and update config