Fixed routing and other minor stuff.