Track exceptions fixes