Clear KissGraph and small fixes