[FIX]: fix some small issues based on review