Add proper support for heroku server hostname - take 2