fixes from RPi