Small adjustments for debug purpose