Fixing more warnings from -Wall.