Fixes for distributed version.