Some commits concerning style and a warning.