Kb fixes

@jiahuang any comments?