Removed remaining problems from merge.