Fix CR style errors