Fixed some errors in windows version