Small changes from master