more minor updates for 2.1.7