Make a few changes specific to the fixed header
Close #239