Minor changes for debugging