All minor changes are fixes to follow up changes from external sources.
LibreOffice and Imagemagick in this case.