Several other changes