Upgrade to rmr which required two changes