Few tracking tweaks