Make -Wall -pedantic happy