minor changes to avoid warnings