fixes incompatibilities