Jeff faust fixes

Lil Christmass present we got from AFX
I'll see what I can do, unless you want to handle this.