fixes remaining inconsistencies with h* headers