Fixing issues stemming from merge.