Image tracking tweaks