Tweaks to Fay support.