RPi compatibility fixes for manual mode