Review fixes for fiber-cord