Some little changes while debugging