some fixes from rpi-land