Fix refresh issues