s1715: minor fiddles