Fixed all incompatibilities with core