Clean up and fixes for 1.8.7 compatibility.