Fix CPUDB detection. Need tests