Fix bugs
Merge