Fixing compatibilities