Compatibility fixes after core system rework.