Fixed a few issues with CHECK