Some changes for debugging