fix windows build; more fixed warnings