Fixing more warnings.