Minor code changes - KPK