Small changes suggested by Boris