Multiple fixes to js tracker