Routes bugs fixed