Fixes for gcc -Wall -pendantic.  gcc still doesn't work, but yells less.