Track Rk-Core fixes from d8516c9.