Build fixes for Win64. Fixes #44. Fixes #54