Some debug changes. Nothing significant to functionality.