Android & windows build fix