Small changes to avoid errors