Add more stuff for debugging.