Point and Route model fixes