Some fixes and load grapgh fix