[FABRIC-408] Additional fixes.