- Bug fixes in wallet management