Finished fixes from merge.