Fixed some routes and path generating.