Windows solution fixes