[RPI] Minor changes