Fix refrsh issues