Fixing horrible performance killers