Follow latest 1.8 changes
Fix build issues on host