Fix track device and kernel