Fixes

closes #692

To be backported:
* Reloading objects to mitigate some caching issues	27488d0
* RexTFV update now uses locks	b888241