Just a couple of minor fixes that slipped under g++'s radar, but were snagged by gcc when I (belatedly) thought to try compiling with it too.