Untested, fixes for the issues mentioned in https://pagure.io/fedora-workstation/issue/186#comment-749234
