Some fixes in edges