Bot fixes to reduce chance of piece collision