Fix bugs
Bump version