Minor clean-up around headers