Fixes remaining 1.8.7 issues