Fixed bugs in Edge Component