Fix Pin unlock issues