Small RSM fixes