Also fixes additional Windows build failures. Closes #22 Change-Id: I8bc416f1a44810c438f095ec137d0d102f4e08a5