Further updates for RPI.