Minor changes as I've now discovered gcc -pedantic-errors. This