Updated diagnostic stuff.