Further changes to general checking