More bid related changes