Fix other 1.8.7 issues