Also fix some of the warnings that jenkins showed. Differential Revision: https://code.wildfiregames.com/D24 This was SVN commit r19115.
This was SVN commit r19027.