A few fixes for refreshing