Fixed SingTao debug changes