Fixes for clustered instances.