Another 'just a commit'

Just a few minor changes here and there.