Fix 3.4 errors