Fix comp warnings on win-32