Refresh: Fixes