#714: minor changes