More refresh bugs