Fixed mistakes C04