Code style fixes.
Routing fixes.