Minor changes
Hacks to try to get junctions to behave