few changes for windows version