Fix missing header changes, squash with previous