Jeff faust fixes

Lil Christmass present we got from AFX
#1080