Fixed all the issues that happened because of the merge.