Update scheduler (temporarily disable wait, always block), update UHCore ref