Fixes for blocks manager and updates system