Fix compat issues