Fixes for regressions introduced by #3404

https://github.com/DynamoDS/Dynamo/pull/3404