Couple of little cleanups for debugging; wartremover config