*Actually* fix track->resource mapping....