Default routes and some fixes