Fixed bugs with earlier merges