Minor work on parsing header