Fixes for Win64 build. It still doesn't work because of some strange linking errors.
Add checkpoint