Minor fixes regarding routing and minor enhancements