#783: #651: various tweaks

opened by thuchacz