#680: #556: 2 tweaks

opened by thuchacz