Fixed several routing issues (in progress)