Some small improvements and bug fixes to Domaincheck module following previous commit.