android & windows build fix