Fixing debug messages

Change-Id: I363db8739f9174ed86a9abb42046b7296e723493