multi-lot fixes