Fix build errors for P3100 compilation