Fixing warnings in the sal sub-project.

No match.