port the android changes to work on windows