Minor changes to avoid warnings