Small fixes for debug messages