Applied rpi patches