* Better management for emb (password is stored in secure store)
* Fix some ANR