wallet fixes