Added some simple external checks.