Package upgrade and dispatch fix