Added fix from @redpola

The fix for issue 1 worked for me as well, on a Linux machine.