Fixed errors after merge