Fixing the build break. (And kpm finding logic).

Fixing the build break. (And kpm finding logic).