Small changes for debugging