Fixed minor issues resulting from merge.