Small changes for debug process