Adjustments for windows compatibility