fixes for different hosts.