Small fixes, and screenshots to determine why tests are failing on Hudson