Add fixes for Win64