Fixing warnings, continued