Address most build warnings. (SOCIAL-418)