Bug fixes found in light of deployment on the Pi.