The same fixes from master -> autotrack merge