Band-Aid fixes