keep fixes isolated to as few areas as possible