Fixed heading structures so are consistent