Merge bugs corrected.