More bug fixes on stock avail.