Improve debugging information