Fixed some merging errors that happened in last merge