More minor changes for debugging