Minor additions for debugging.