fix warnings for optional fields