Debug and Hosting changes