A few small other changes