[nemo-fileroller] picked some fixes from upstream