[Mod] Fixed minor defects.