Improve in messages for debug