Small changes from rasp-pi side.