[4.2] Minor CS Fixes To Routing