various debugging-related revisions [ci skip]