Some Debugging Changes.