Fixed errors resulting from merge