#1821: #1815: more improvements

opened by thuchacz