Fixing warnings reported in Bug #2204.