Rejig forced hosts some more - closes #927