Fix for new trajectory namespace.
Merge fixes.