Header Scaling Fixes