A few other minor changes