A few kk changes

Change-Id: I11066b9dd9a861f0dcef0755884b31a13a8ad52f