Some fixes for straighter trajectories to work better