Fixed keystore management promises