Couple minor fixes such as header