More refresh fixes