sep-019: other minor fixes