Fix 5.5 and 5.6 errors.