Fix some bugs and increment version