Raspberry: bugfixes