Jeff faust fixes

Lil Christmass present we got from AFX
I think this is the one thing I want to investigate closer, since it seems to be patching some underlying issue.