Fixing some bugs caused by the merge