Fixes refresh operation bottleneck
Fixes Warnings