Fixes for Per Host Configuration.