Small changes that could be useful