Graph scripts fix