Add some additional changes since 1.6.1.