Small fixes to the part driving picasa