- fix some issues issued by the feedback on Aug 19