A few other small changes