Bug fixes
Merge remote-tracking branch 'jswiergo/dynamic-structs' into overlapping_nodes