(Start of) Windows compatibility fix