Fix gerrit bugs
Fix some nodes being drawn as (0, 0)