Made fixes due to merge.