More stuff to fix shrinkHeader handling problem