Fix bid association
Cleaning things up