#722: minor fixes