Make it work in more host environments.