Fixes to registration tracking