Header Less fixes

Header Less fixes