More fixes to router