Multiple major fixes