ECO-misc-37c4: Rebalance for core type changes. Also some fixes and optimizations