Minor fixes and enhancements since 1.6.0