Adding / Fixing some debug messages