Misc refresh fixes.