A few KCM misc fixes
Signed-off-by: Fabiano FidĂȘncio <fidencio@redhat.com>
(cherry picked from commit 32f2c81e59c5aa0625b276231aeed603e0e645d0)
(cherry picked from commit 2540bf426da0503c8439f0a90d5e2122d5e0ba09)
(cherry picked from commit 89a1543353ffd3da80a5eeba2d63e7bcaab1e07d)