Changes to compile for Win64