Some more Rpi refactoring