Fix how we get current host