RPI updates with fixes