Minor changes to previous commit (avoid warnings).