Fixed errors that remained after merge