Fix build errors Part_3