Fix 6.1 stuff