Fix bugs in tendering