Fixed Windows and Linux issues