Fix 10.8 related issues