Fixes tracking and API normalization