Some more fixes to get Travis-CI to work with checking headers.