Few fixes for RPI support