Draft: Various downstream smartcard fixes

There have been a hodgepodge of small smartcard fixes in RHEL that i've failed to upstream for no good reasons. This merge request is for them.