Minor header map speed improvement