Further required tweaks for running on trajectory datasets