Minor fixes
Trajectory predictor (oracle)