Fix errata and add LOG to check enter/leave api