Minor fixes everywhere.