Fix a lot more -pedantic warnings