More core fixups and updates