Fixed minor bugs in Request and Router