Some modifications for STK 1.0.7