Add proper support for heroku server hostname