Backport changes from demo (highway).