bugfixes for checks and tools