#765: minor fixes