Applied quick fixes