The first issue is fixed upstream [0] and is part of the just release v3.21. The patch to fix the second [1] was rejected though.
Which means this can be closed.[0] https://source.winehq.org/git/wine.git/commitdiff/2dfff7e63c4fc6f97e83df448a2c2b8c4b9eedd5
[1] https://www.winehq.org/pipermail/wine-devel/2018-November/135680.html
