Fix compile issues
Merge branch 'develop' of https://github.com/EpicDream/ledger-wallet into develop