Fix some 1.8.7 issues