Fixing refresh issues