Sort out track pool bugs