Fix 1.7.10 issues