Fixing errors introduced during the merge