Fixed all issues encountered in windows