31/10 heng bug fixes for L100