Fixes, including to vignette and fel.