Fix bugs
Bump sdk dep