Router fixes