Small changes from future