fix a few incompatibilities