Minor debuging changes