Minor changes to a few variables