Minor bugfixes, tested in an actual raspberry