Merge major fixes