Improved refresh and delay handling