7.8 Fixes
Fix 7.8 Compat