Small changes to help debugging