Fix more trajectory bugs.