Fix local compatibility