Fix issues of mozzilla review