Fixed refresh issues