Fix build errors Part_4