Fix some regressions due to change in UpsCommands api.