Fix some issues with Google Code importer

Thanks, @mrtux, for reporting all of these.

See merge request !551