Minor bugfixes. Functionally validated through post-route simulation.