Fixed bugs in Vertex component