Track error fixes