Various changes related new host setup.