More fixes for compiler warnings.
More fixes for compiler warnings.

jjphatt/polyamri-dev,jjphatt/polyamri-dev,jjphatt/polyamri-dev,polymec/polyamri-dev,polymec/polyamri-dev,jjphatt/polyamri-dev,polymec/polyamri-dev