Small changes to prevent or diagnose errors