last fixes (thanks, @marmarek!)
last fixes (thanks, @marmarek!)

QubesOS/qubes-core-admin,marmarek/qubes-core-admin,woju/qubes-core-admin,marmarek/qubes-core-admin,marmarek/qubes-core-admin,QubesOS/qubes-core-admin,woju/qubes-core-admin,QubesOS/qubes-core-admin,woju/qubes-core-admin,woju/qubes-core-admin