Bring back previous fixes

This reverts commit 1e7b7358bd2b902eb53ffdeb33b41aa2ec260f6f.
Merge branch 'master' of https://github.com/DynamoDS/Dynamo