Few more tweaks to routing and handling