Use the correct transport constants
Remove some incorrect guards created when assembling graph