Various bug fixes upon installing on RPi