Minor changes for debug