Minor fixes, but refresh is still not good