Fix typo and 1.8.7 compat issue