Various fixed for Raspberry PI