Fix missing headers variable
Merge branch 'fix-host-with-port'