Fix routes declaration + minor fixes.