Changes necessary for proper 8 TeV SF application