minor edits to remove warnings