Fixes for edge creation