Fixed errors resulting from rebase.