Changes for windows compatibility