More core fixes.