Add PwPasskey helper
Fix mistakes