Miscellaneous fixes
The first two commits are related to the rpm-ostree.
The last can be reproduced for example by executing command from #1793 (comment 1583353) .
The first two commits are related to the rpm-ostree.
The last can be reproduced for example by executing command from #1793 (comment 1583353) .