Fixed some compiler errors related to merging