Misc bugfixes for YubiKey plugin