Fix incompatibilities