[#141] some rps fixes