Minor fixes and enhancements since 1.7.0