Add better debug messages