Fixed errors that occurred due to the rebase