Fixed some minor things to get no warnings from -Wall