2nd batch of bugs fixed for Ptracks