Small fixes everywhere.