Tweaks and fixes from FIG conference