Update to match the latest kcb_skel project