#613: #556: pinceaulx tweaks attempt 2

opened by thuchacz