Fix compat errors