and another set of small updates from dry run