Correct some 1.8.7 syntax