Fixed some incompatibilities