Fixes on tracking exception