#779: #670: various consistency issues

opened by thuchacz