Fixed Windows warnings.

Change-Id: Ibe734a90205d158ce935d5a1bbc2924b3c2f05dc
Merge topic 'cleaner_multislice_view' into next

faaa7576 Fixed Windows warnings.