Fixed errors related to recent merge.