Minor modifs to Trajectory.waterfall and kdvMisc