more refresher fixes