Fixes in reloading/