Pkeyauth fix and updates - clean up and fixes