Some diagnostic additions