More tweaks to transport stopping...