Changes to accomodate vpp throttle branch.