Update to compile with latest 4.8 head