Windows project fixes