bugfixes for issues encountered in testing with new check gateway