Fix baseHeaders