Minor edits to clear a couple of warnings