Small fixes

Some complaints I got from an IDE. I thought others would like to see them gone too.