More minor changes going into 5.0