Minor changes to generate FFM paper figures