Merge "Fixed some bugs"