Fixed more router issues.