Fixes for Raspberry.