Hostile checks

Some tweaks to PR #4059