Minor updates to pre-provisioned key logic.