Some changes for new host.