Fixes related to data clumps detector