More compiler errors fixes for VS2015

9 jobs for master in 81 minutes and 59 seconds (queued for 54 seconds)