Updates to preserve compatibility with 1.8.7