Workarounds for 2.063 issues
Merge pull request #360 from Dicebot/2063_fixes

Workarounds for 2.063 issues