Fixed two little things that got reported when I compiled with -Wall

See diff for changes.