Compatibility with core 1.4. Small fixes