Clean up of VS2015 warnings - Part 2b
Clean up of VS2015 warnings - Part 2b

BartokW/sagetv,google/sagetv,google/sagetv,gasinger/sagetv,gasinger/sagetv,gasinger/sagetv,skiingwiz/sagetv,google/sagetv,BartokW/sagetv,jusjoken/sagetv,JREkiwi/sagetv,andyvshr/sagetv,jusjoken/sagetv,andyvshr/sagetv,google/sagetv,andyvshr/sagetv,BartokW/sagetv,skiingwiz/sagetv,BartokW/sagetv,skiingwiz/sagetv,andyvshr/sagetv,skiingwiz/sagetv,gasinger/sagetv,jusjoken/sagetv,JREkiwi/sagetv,jusjoken/sagetv,JREkiwi/sagetv,JREkiwi/sagetv