Http Service fixes for 2.0