Begin dividing fixes into subscripts for ease of maintenance