Fixed Build Errors in Matching and Trajectory