Fix for CLS build warnings. This gets the number of warnings for the solution down to 20.