Fix 5.5 problems i hope